Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 22 Sep 2006 16:22:18 +0000 (17:22 +0100)
committerSteven Smith <ssmith@xensource.com>
Fri, 22 Sep 2006 16:22:18 +0000 (17:22 +0100)

Trivial merge